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