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

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