Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition."...
Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition." am: f63b7f9c am: a23e6a0b
am: 18fce00d
Change-Id: If122ce9cec0ddfe4e9795f8eeb951d119187ae2d