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

Change-Id: I5647b6770ef65c78615f46e50bc147b106ca52a6