Android CTS 6.0 Release 7 (2906653)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"