Revert "Experiment with Google 4.9 for ROM"

This reverts commit 44fa85aca255a44f7f7d3c710f0bebbe0f1df3fe.