Android CTS 6.0 Release 30 (4844167)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"