am eb77dbf0: Merge "Revert "manta: batching and timestamp issues""

* commit 'eb77dbf00ed67a8e12ab376921300883f6975ce2':
  Revert "manta: batching and timestamp issues"
tree: eadd8312dfd4eaeabc1a5403a5bd25c87c27a7f6
  1. 60xx/
  2. 6515/
  3. 65xx/
  4. Android.mk