am cd29983b: resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp
am cd29983b: resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp

* commit 'cd29983b31c1da70289fa3589770933333389921':
  Clean up test makefiles.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base