am e4354ba7: resolved conflicts for merge of d2819621 to honeycomb-plus-aosp

* commit 'e4354ba71e9ac21ff4e6864da7287db472c50e84':
  move platform tools to r8.