am 8428506d: (-s ours) am 803b7291: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk."

* commit '8428506d14303f9f523c64b5b52a4307f8c75fb7':