Merge tag 'android-4.3_r2.1' into 'jb-mr2'

Android 4.3 release 2.1

Conflicts:
	res/layout/alarm_time.xml
	res/xml/dream_info.xml

Change-Id: I6a02f18b14c9fde7381129f8dba00de7324f378c