am afc27aca: Merge change 5637 into donut

Merge commit 'afc27acae7da84453047088b7e19b07eef0dc734'

* commit 'afc27acae7da84453047088b7e19b07eef0dc734':
  Add support for LOCAL_C_INCLUDES in Android.mk, to better match the Android build system.