Merge "libfiemap_writer: test pinned file bit" am: 73bb342956
am: e0df95d8a8

Change-Id: I02a0da79d123a8ef7ea13af7ffcef3e3b487dc57