Merge "Implement C++11 move semantics for android::FileMap"