Merge "Move share2 & tools2 files to system/timezone"