Merge change 4493 into donut

* changes:
  Change import for IIntentReceiver since the class has been refactored from android.app to android.content