My previous change included a manually-edited version of current.xml to get the build fixed. This change includes an equivalent file as generated by update-api, so that the next person won't see a bunch of unexpected diffs. Change-Id: Ia244d90248ec54ddfa3b7344c09720c56ff201e3