Merge "Make Condition use CLOCK_MONOTONIC"
am: 7f932afefc

Change-Id: I755d45661ad5575db6dbd3e86f2860e718a6ff0c