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

Change-Id: Ib6d5118ca3863e2a6c9ab9f47298bb3d969aa5ef