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

Change-Id: I264672496699104e2cd86e589fa3e412fe8880a1