Android CTS 6.0 Release 8 (3046108)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"