am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'd37f91d18da6e87eb3f2d11dd1cd1645e255cd38':