Merge "Fix the build, proper current.xml." into gingerbread