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

Change-Id: I5565b341338f75e9dbdd8405b07419219f61a940