Merge "Convert support library to Android.bp"
am: a0538cf3e3

Change-Id: I0b28c6d97c7890c314c674a95f9a0db4a1b15953