this is commit https://github.com/SimpleAOSP-Lollipop/platform_build/commit/fe22405d24a14cd263cbe15e84d9c0dba91fb1b7
for backuptool support, cherry pick didn't work for me