Merge "vndk/window.h must be C compatible" into oc-dev
am: 0e7305cb0a

Change-Id: Ic135b9dba72dfd2c38f5ff63a363d5bcb3e6ac4d