Merge "amrnb: Fix Android.bp formatting issues" into main