Merge "frameworks/base: Update a few more references to android.jar."