Android 6.0.1 release 42 (MOB30I)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"