am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

* commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
  Self-extractors for JRO03R binaries for maguro