am 7c6a2a4c: resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp
am 7c6a2a4c: resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp

* commit '7c6a2a4ccf30ce74a5acddec406fdf4243da1e50':
  build: Support packaging for system_root_image.

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