Merge "SharedMemory cpp: use proper nativehelper headers" into oc-mr1-dev-plus-aosp