Merge "Revert "Frameworks: Translation Import Portuguese, Brazilian"" into kitkat