[automerger skipped] Merge "Convert support library to Android.bp" am: a0538cf3e3 am: b4854f38e2  -s ours
am: 83181346e5  -s ours

Change-Id: Ia45be0e7f17c5e7e195f0db0c48dea504adea1ed