Merge "Refactor existing android tz generation tools" am: 0b6e8448fc am: 9a8f367648 am: 13de2cde94
am: 6286dd0f47

Change-Id: Ia448bdd846a05545b493c39a4f38c24f9802a1bd