Merge "Rename variable containing Core Java libraries in build/apex/Android.bp." am: 794350fd am: bafb2e90 am: 8c19b6d4 Change-Id: I8dabfdaed76675658b72f167a4c1371b63d74aba