am 3d2c90d1: am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""

* commit '3d2c90d18608650614cf3940179cf13251e82178':
  Fix mmma uses like "mmma ./external/apache-harmony"