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

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