Android CTS 6.0 Release 9 (3102289)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"