Add unittests for file_scanner. Fix minor bug. am: aef0c5300a am: cdf347ba3b
am: 00b3df3506

Change-Id: Ia7b5ad27ace2aec935ae645b199364a8075531b5