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

* commit 'a56b9f48d6204c44383220b574fa290a9aaabb1a':
  Self-extractors for JRO03R binaries for maguro