Merge "Use Android systemTime implementation for host linux." am: c00229c34a
am: ea51c30751

Change-Id: Ibc28d59b80cd7cdd19656d83346665313052ef5e