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

Change-Id: Id710f3081bee4a179580728fabe2ac137a62fcae