Fix mma/mmma by making gettop canonicalize TOP when set

Bug: 17253957

(cherry picked from commit a5c4f178ae3f3e94b1d1dceae3cc8d3196633c4a)

Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"