ecj: provide android-21.jar instead of android-16.jar (#2274)