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

* commit 'c6c6ab50bc11d55f3135312ceccbcf0c400b437e':
  Implement C++11 move semantics for android::FileMap