Merge "Convert fir to Android.bp"