Android CTS 6.0 Release 31 (4890202)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"