Android 6.0.0 release 2
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"