[automerger skipped] Use libnativewindow for platform variant of libagq am: 57155bd1ba -s ours am: eaf6b86cdc -s ours

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

Change-Id: I86eaf68e5a61e3abff9edac20f8d2ee32ff7c35c