am abd5bbc4: am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
am abd5bbc4: am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev

* commit 'abd5bbc4febe61f53641ac7c43160e161e12c1dc':
  Bump generic_x86_64 system partition size - DO NOT MERGE

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