Merge changes I29453595,I6586c8e5

* changes:
  vts_fs_test: Only require EROFS in T+ kernels.
  Revert "Do not enforce EROFS for android-T and below."