Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624 am: 323396993c
am: 6f8244b62d

* commit '6f8244b62dbaa6da40c7914c0d4e94ed53e226ac':
  Fix mm and mmm in Android.bp directories

Change-Id: I0b6d64aed2b4fae846b66c8884b418af9e3ddde8