Merge "fs_mgr: avb should use built-in kernel command line parser"