screenshot and fastboot

Change-Id: I2dd7cb17ece43f673d57db0d8d27eb33219a613c
Merge remote-tracking branch 'pa/jellybean' into jellybean

Conflicts:
	core/res/res/drawable-hdpi/ic_lock_screenshot.png
	core/res/res/drawable-mdpi/ic_lock_screenshot.png
	core/res/res/drawable-xhdpi/ic_lock_screenshot.png