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

* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.