Merge "system/timezone: Prefer Os over Libcore.os"
am: 81a779f25e

Change-Id: Ia8564f4a030e441023fd6326e315fd2857086d4d