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

Change-Id: Ic101a355115a5b02baaefd89a99076073aff5372