Merge "Fix mm and mmm in Android.bp directories"