Android o preview 3
Merge "Remove all reference to prod-tests dir targets."