Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce65 am: ab231ee7 Change-Id: I9f72ae78b8341b1b20250c0f8090513db6e77e7a