Merge "RFC: Generate select instruction for conditional returns." am: 4ec14ff3d6
am: cadda8db53

Change-Id: Icc95afd3eb9f38c4ce2ab463f5b58a3e19658f24