Merge changes I86958ebc,I0449575a

* changes:
  adbd: allow reading apk_data_file
  adbd: allow reading rootfs dir