Merge "Convert lib to Android.bp"