am 52ea2066: am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."

* commit '52ea2066a1c3aedf44e3f64bfe1e4db80707e98f':
  Support to build image of root file system with /system and ramdisk combined.