am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"
am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"

* commit 'b139ae078c8b2598889c2fde1a39a9d64f27dc62':
  Add support for system images that contain the root directory

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