Android CTS 6.0 Release 25 (4485418)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"