Merge "Simplify DexRegisterMap API."
am: f5fc6bcdd9

Change-Id: Iab1dd4068d465209107653c3a2f0a5078bc22b59