Clean up use of hidden APIs

Also update imports of CbGeoUtils

Bug: 135956699
Test: build and run appcompat script
Change-Id: Iabf338fbf9213bcf69cac491ebe13e3437f98f04
5 files changed