Merge change 24726 into eclair

* changes:
  Update AndroidManifest.xml for new Intent locations.