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

Change-Id: Ia76ba313cb62098426314099240fa4705ad3730f