Merge "Revert "Update generated files for Android""