Merge "Remove native calls to HWUI from Surface and use the public API instead"