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

Change-Id: I6c6850d22258b1241a4e5e42244ed46ebf53e06b