am e72beb53: Merge "Remove dead code."
am e72beb53: Merge "Remove dead code."

* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
  Remove dead code.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build