am 29b708aa: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '29b708aac70b694879d4867e1943926716a08fea':
  JSS11F
  "JSS11E"
Merge "emulator: increase system partition size to 400M"
am 5411ef9c: Merge "emulator: increase system partition size to 400M"

* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
  emulator: increase system partition size to 400M
am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M"

* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
  emulator: increase system partition size to 400M
am 38437bad: am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M"

* commit '38437bade23ff6fc5fe5c30dacebc178c56d47ba':
  emulator: increase system partition size to 400M
"KRS11D"
"JSS11G"
"JSS11H"
fix design/develop boxes float

Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
emulator: increase system partition to 550M

Yes, 400M isn't enough. I can't believe it either.

Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
Merge "emulator: increase system partition to 550M"
am 4e132ca5: Merge "emulator: increase system partition to 550M"

* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
  emulator: increase system partition to 550M
am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M"

* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
  emulator: increase system partition to 550M
am 4e76f806: am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M"

* commit '4e76f806d49c0b4e7fa31653555a5a16713a8778':
  emulator: increase system partition to 550M
Establish the built module dependencies on prebuilt shared library

This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
Merge "Establish the built module dependencies on prebuilt shared library"
Establish the built module dependencies on prebuilt shared library

This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f296570e0bda93b433a7aa86ad138dd1705e)
am ba9636d4: Establish the built module dependencies on prebuilt shared library

* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
  Establish the built module dependencies on prebuilt shared library
am 3aa8eb68: am ba9636d4: Establish the built module dependencies on prebuilt shared library

* commit '3aa8eb6810e523f6056da58079f65e5fbcd628d0':
  Establish the built module dependencies on prebuilt shared library
"JSS11I"