Android 6.0.1 Release 70 (MOB31H)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"