Android CTS 6.0 Release 21 (4214424)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"