Merge "Consistently use CLOCK_MONOTONIC for timing encryption" am: f9510e3262 am: 395c47e046

Change-Id: I5aa535a2dc31bce130c1e48c8a3cf9bdc1a8b238