Merge "Fix build errors with libgps.utils.so"