Merge "Fix mm and mmm in Android.bp directories"
am: 8ed91b6624

* commit '8ed91b66240d3071a42365737f4cd5c7dbe601e1':
  Fix mm and mmm in Android.bp directories

Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376