Android CTS 6.0 Release 20 (4120755)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"