Merge "sharedmem.h: fix the docs." am: 03f12ae919
am: 0327bdacf5

Change-Id: I14ce792c0237becd037ca4563d4bb70d78693beb