Android 4.4

Merge from schischu