Merge \"Refactor register allocation to be pluggable\"
am: 8a759904d4

Change-Id: I7dcf31e96d0eb23f794da94c4268804ab22d82dc