Android 6.0.1 Release 78 (MOB31S)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"