Merge "native_window_aidl: include cpp headers only when needed" into main