Merge "bootstat: Remove custom uptime parser in favor of elapsedRealtime." am: 914955ae9e
am: cdfe67f575

Change-Id: Icf0af3e8a46e4e3fee9f3364fd26a31c9420c7b7