Merge "app: aboot: Remove UFS_SUPPORT dependency for android.bootdevice inclusion in command line"