Merge "Fix CtsAadbHostTestCases#testSyncFiles_extStorageVariable" into nougat-cts-dev am: b16a82e23c am: 794cd34629
am: d3d82c7480

Change-Id: I1d799e30840cbec08856682472ad6c24b782317b