Merge "app: aboot: Modify android.bootdevice cmdline"