Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383 am: a00020317e am: 9766909149
am: 4fa6e4855b

Change-Id: I9c65f8d71f50a65c89322b279188cf9622532435