Merge "Convert libandroidfw to Android.bp"