Updates for gscan HAL updates in N

This will compile, but all new functionality may not work

Change-Id: I88f27f375121c6b27377b075e9fd6bfad7b05aa4
2 files changed