am 7d97504f: Merge "Maguro binaries for JOP40" into stage-aosp-master

* commit '7d97504f30277acd0d71f3d814ce9f80aa69f7e4':
  Maguro binaries for JOP40