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