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

Change-Id: Ia777383516cd511746b5cb998175c6a3b72df9c0