Merge "Include chrono.h"
am: fc71730834

Change-Id: I83bd41ac34b04352627569c92189886528a1f1c8