Android 6.0.1 release 21
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"