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

Change-Id: Ifbf775ad4064572e6dc3f2fabf4b2f8a7c2b2c7d