Merge "Convert framework.jar to Android.bp" into stage-aosp-master