Merge "init: Use android::base::boot_clock instead of /proc/uptime"
am: 8e73e6f242

Change-Id: I32c0ee2092a39af494126b7fbe3f42e0f6c0a2d1