Merge "[automerger skipped] Use libnativewindow for platform variant of libagq am: 57155bd1ba -s ours am: eaf6b86cdc -s ours" into rvc-d1-dev-plus-aosp am: 854547cb57 -s ours

am skip reason: Change-Id Ife99745fbb57c1d85241cf95c3a9767589d97f46 with SHA-1 57155bd1ba is in history

Change-Id: I114bed352a8d76ff2c04443a11e9df4de2bb710f