merge testing fix adb from gilber32 and fix memory leak ext4 xattr