Merge change 3868 into donut

* changes:
  ADT #1909458: fix 'android update project': "build.xml is too old"