Merge "vndk/window.h must be C compatible" into oc-dev