am d615f34b: Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
am d615f34b: Merge "media/mtp: Add missing LOCAL_C_INCLUDES"

* commit 'd615f34b565bce98e202397240448845b934e596':
  media/mtp: Add missing LOCAL_C_INCLUDES

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