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

Change-Id: Ia273a84ce247bdd8d9396b44cdda02e4ff6bf573