Android 6.0.1 Release 47 (MMB30K)
Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"