Merge tag 'android-4.3_r2.1' into HEAD

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

This reverts commit 3083c3c93e12c4548bbe3bee1fecd1a45478657c.
Add permission manager strings back

Change-Id: I62d1fbeab3bb169bf101fcd7347c1ff5374a126d
Unbreak merge failures

Change-Id: Ifc0141f1d594e1f5e04ee8532c985e6b3d480fb3
Fix build

Change-Id: I06d9ec608884c2fed1f59d5c5c392b813d31ec58

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java