updated
Merge branch 'master' into taintdroid-4.1.1_r6