am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

* commit '21eda0c31a96068540649c310850958331c258b9':
  Remove version requirements for AOSP
am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

* commit '21eda0c31a96068540649c310850958331c258b9':
  Remove version requirements for AOSP
am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

* commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
  Self-extractors for JRO03R binaries for maguro
am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

* commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
  Self-extractors for JRO03R binaries for maguro
JZO54I factory images for yakju

Change-Id: I7e9e302e4b620ce94dbcbbaade76c4e842f66b85
am e62b9f87: JZO54I factory images for yakju

* commit 'e62b9f871d31f92c3b7109913d316d63c26d4745':
  JZO54I factory images for yakju
am bfe7277c: am e62b9f87: JZO54I factory images for yakju

* commit 'bfe7277c6f70ac700f1858ae1d75058ca42f31d0':
  JZO54I factory images for yakju
JZO54I factory image for yakju

Change-Id: I21b53cf6e4b0e696209a8f9d6bca434c1b191652
am fb853a6c: JZO54I factory image for yakju

* commit 'fb853a6cc780dd09752029c530207b83f7e781b6':
  JZO54I factory image for yakju
am 1c1e54c3: am fb853a6c: JZO54I factory image for yakju

* commit '1c1e54c3f4aabec1d111eba44d87e1bd06f4940b':
  JZO54I factory image for yakju
Merge from jb-mr1-aah-dev

Change-Id: I690b2e7bf9a06fa53fd6fc922f619b6a0020d158
am bf5faaca: Merge from jb-mr1-aah-dev

* commit 'bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6':
Distributables for JZO54K for maguro

Change-Id: If93b31632bec783efebcbe819cb2fc21ae2e2791
resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp

Change-Id: Ib2ccea0895a773aadc09d96cacf119d5c97eed9a
am 834ce287: resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp

* commit '834ce287666bf5809dc5be5c4b2a481f21fa7901':
  Distributables for JZO54K for maguro
auto-generated blob list

Bug: 4295425
Change-Id: I48fc47771df0a8737069e879683bfd2bb71b9446
am c93fe3ee: auto-generated blob list

* commit 'c93fe3ee8e58c2dbd27b1f82a7dfdc7b040e4244':
  auto-generated blob list
License for NXP binaries

Change-Id: I3826efb2d9df0afecc5357a51c391a5d7ccfd42e
am 8bc8d926: License for NXP binaries

* commit '8bc8d9260ae952f2c27a89a8d6f20986a120c50f':
  License for NXP binaries
am 0fb51b2f: am 8bc8d926: License for NXP binaries

* commit '0fb51b2fdcf6e9680610df6fc61dbf53971f2ea5':
  License for NXP binaries