[automerger skipped] Use libnativewindow for platform variant of libagq am: 57155bd1ba am: f9918a8572 am: 7c31a9c1f3 am: 554965c66d -s ours

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

Change-Id: If810754946b815667157b7f9578aa87f868e33a9