Android CTS 6.0 Release 15 (3666707)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"