Merge "SquashFS whitelist support." am: 637989a574
am: 3f99edf598

Change-Id: Iab7d7633ef37238f2fb133df97d9e5d80c7544ed