Android CTS 6.0 Release 13 (3530687)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"