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

Change-Id: Ie78c05e0857b980215c237520d4e8f04e376e74e