Android CTS 6.0 Release 23 (4337277)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"