Merge "Small refactor of MIN/MAX compiler code."
am: 7a3e7833c4

Change-Id: I1fa3d4c0b95167abd842c7aedcb2713d0aea454b