Merge "Revert "fix build"" into gingerbread