am fb36e884: am 43cb7695: Merge "Revert "Cleanup vroot test and fix false positive."" into jb-dev

* commit 'fb36e884cf09806ea098a7fb386a41915af218e2':
  Revert "Cleanup vroot test and fix false positive."