Merge changes I96d1acb3,Ief00af72,Idf8f4a0e

* changes:
  adb-remount-test: add /system/priv-app
  adb-remount-test: support devices that do not have verity
  adb-remount-test add --no-wait-screen option