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

Change-Id: I8fe9525c90d8376f5e76f35afc454a7641d08082