Merge "Convert support library to Android.bp"