Android CTS 6.0 release 1
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"