Android O MR1 Preview 2 (OPP6.171019.012)
Merge "libhardware_legacy: vendor_available" am: 483a68f68a
am: 32e427d64d  -s ours

Change-Id: I74be36cfc5d9712d2580b547bb4c2550132d0116