Retire old hacks for a bad G2 device repo

Change-Id: I16861cfec1c1919b7ea99c0d8cfb73c7c986f817