Android CTS 6.0 Release 22 (4267323)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"