improve support for android 4.x
Merge branch '1.x' into 2.x