Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" am: 23f4e6b0a5 am: cefdacef3c am: 39ce80f0e0
am: 0a2efefbe9

Change-Id: I9fcfe3120f15b50efdb25a5d6487b9ea33a0bc30