Merge "Fix build: track the naming change" into froyo