am f6030454: Merge change 4493 into donut

Merge commit 'f6030454c880a156a8a1d56bc2a4bb653994a0e7'

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