Checkout the one I wanted, that one was put here by someone... nevermind.

Change-Id: Ia083a6c2a8b56b49c6c4d0dcd084af5981579e04
Fix g2 being listed in Android.mk as filtered TARGET_DEVICE

Change-Id: Ife2a6a42929c5b264683e456b57a14c3820a8a2f