Android CTS 6.0 Release 12 (3417974)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"