Merge "Switch to android::base::ReadFully"