Merge change 2960 into donut

* changes:
  CTS: Clean up and fix MemoryFileTest
tree: b04bf893e60aea20f97aaa0cc1ae92eb21526608
  1. tests/
  2. tools/
  3. Android.mk