am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"

* commit '088521ef906346e06ce39c877ff142c2467e3a79':
  Allow system images larger than 2GiB, pt. 2

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build