Merge "Convert framework.jar to Android.bp"
am: 3d16ff7a4a  -s ours

Change-Id: I0652992a85c11b8be5f5b7428382bc3653c0e2a3