Merge "ext4_utils: skip symbolic links in basefs file" into oc-mr1-dev
am: 0a26d1b893

Change-Id: Iaa957a7f58871a23304511f175ef35c3da800c2b