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

Change-Id: Ibef66ccd1a1fe362692ee45cb86cd9c0212c1f85