Revert "core/jni/android/graphics: Cache copy of pre-scaled Bitmaps"

This reverts commit b7ab42b70eb8aabaddc3f4d7e62a5d7eca965eae.
Fix merge

Change-Id: I80893d1be6a5ae133e0795c8f678b105e94f22eb
Fix merge

Change-Id: I4dcc95963dae73add9c64585aa449b0b62f9a36b
Build fixes (Still not ready)

Change-Id: I0e9b15ed8833223bf66aeaa7171a4903d1bef6d7
Merge branch 'jb43' of git://github.com/ParanoidAndroid/android_frameworks_base into jb43

Conflicts:
	core/jni/android/graphics/Canvas.cpp
	services/java/com/android/server/NotificationManagerService.java

Change-Id: I0efe1a62a644615fa1244edc051e81fc37d8d373