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

Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82