Keep os/android-os.h compiling now we have __key in <sys/ipc.h>. am: 61e00348b1
am: c0df2e6737

Change-Id: Icab6d6f2d97d841bb5dff74d4316bc7012b4c0f6