Squash 4.3 changes.

PS2
  Fix derp

Conflicts:
	apps/Development/AndroidManifest.xml
	samples/training/bitmapfun/src/com/example/android/bitmapfun/util/ImageCache.java
	scripts/app_engine_server/memcache_zipserve.py
	scripts/app_engine_server/redirects.yaml
	sdk/plat_tools_source.properties

Change-Id: Id141787e0561f827b89156b44bac10c0513e12a6