合并自 omnirom android-4.4

Change-Id: I53380ee203c1fe75d37f24f99e36f5c5a62e5b39