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

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