Android 6.0.1 release 40 (MOB30G)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"