Merge tag 'android-5.0.1_r1' into lp

Android 5.0.1 release 1

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml