Merge "Revert "Get the local time zone into an emulated Android TV""
Bart Sears [Sat, 25 Jun 2016 06:11:14 +0000 (06:11 +0000)]

Trivial merge