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

Change-Id: I1105bd02d2f5be3676b1eb32d3de5e3ac010163b