Merge "Simplify DexRegisterMap API." am: f5fc6bcdd9
am: 98b4aaa345

Change-Id: I9e591121c273643dbdfce5ffb914b8f61c696dc1