Base: Fix crash of SystemUI

Change-Id: Ie18faac4dce45eb2fe9ca07d628bed7cd0eafaab
Merge remote-tracking branch 'omni/android-4.4' into android-4.4