Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_base into HEAD

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

Change-Id: I3133f7a4667c9d67c3b0f83061b3a26d57061ce5
remove duplicate code

Change-Id: I98e2bdea162f450b81540a55941ab4a917a9047f
fix build

Change-Id: Ia9cc1f5b5dddfde971e378d85cc6b286d1274442
forgot the semicolon

Change-Id: Id40e0e8d9e0ad56245e385525ed03e47c434ab2e