Merge "Rename variable containing Core Java libraries in build/apex/Android.bp." am: 794350fd0e
am: bafb2e907e

Change-Id: I0f77268afe6868c939c67b5e1223aa94bc450b35