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

Change-Id: I55cd9b440611ad446523f5a6899d09fb8d57f1de