Merge "Store elapsedRealtimeNs as int64 instead of long"
am: dc51e5ef21

Change-Id: I487ca72036cfcc28bb04aebc44c7f3ca156a78b4