Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: Id44d5168fc8a77c4a30a86729c7fd7194e97bc1b

Conflicts:
	core/res/res/values/config.xml
Merge branch 'lollipop' 5.0.1r1