Merge "Add a register allocation strategy compiler option"
am: 1568ed9bd7

Change-Id: I6b9c304760fa7ebbc924c4add9b03ac4654ef2f1