v31: Get rid of /data/xposed
Merge branch 'upstream'
api-10