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

Change-Id: Iba994622994d6eac47133b99511fcacf21bfd517