Merge "Revert "Frameworks: Translation Import Chinese (Simplified)"" into kitkat