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

Change-Id: I71db5756d06beef0d453113b2ff0c13913665219