Remove Goo related props

Change-Id: Ia4f9076bfe15609b2ce04aa7847bae20b1ca2615
Fix Superuser on encrypted devices

Change-Id: I8f9367b2f83cfe02dd4757d80a6dd111574bb055