Merge "releasetools: Drop the support for fstab_version 1." am: afc0ea14d8
am: 39809e3800

Change-Id: Ib63f95327d204d692737a544bf2b401dedea504c