Android CTS 6.0 Release 17 (3866870)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"