Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime.""