Merge "Convert framework.jar to Android.bp" into stage-aosp-master
am: 05126403db

Change-Id: I3d4ad90aff8415aeaf44d13805dd1267151f17d4