Moves matrix function to GeometryMetadata. Fixes scaling issues.

Bug:7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
3 files changed