Merge "adb_remount_test allow to run on eng builds." am: 99ff4dd35d am: 5fb43a8787
am: eea99b5ef4

Change-Id: I76429cb817d24d8beab2c1d866bbddc2a202c885