Merge 8f73f9aafd08457b9616100f0160491c2d46891b on remote branch

Change-Id: I365a8e29bc910f682806144b3bb73f67a876e53e
tree: 74083550606a0860aad6c246ccfb366f840e8d43
  1. debug-tools/
  2. Android.mk