Merge "Rename variable containing Core Java libraries in build/apex/Android.bp."