Fix potential tree conflicts with scrypt

Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc
Release map after zip install

Change-Id: I4ae145669786ad0932297ae0ae095cbc6f3f696b
Make custom themes work again

Change-Id: Ib9ad011428603979f7dd8a2708989feb9b13e075