Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>" am: 183ca56ce2 am: c837e8ce1b
am: b566804ac6

Change-Id: Id6df2ef22308839386a256275bf42ffe76425094