Merge "Convert fir to Android.bp"
am: 1a6ca333ef

Change-Id: I730040faab53bc1b8f1407a2bfad614883e200ec