am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"

* commit '2fc4d4359b268cbf3d0f73d670a219f12d440e86':