Revert: jf: fix race condition at boot

Seems to be fixed to work properly now

Change-Id: Ib577525ef1b1b6ef06872891aa1807df13f67878
Fix zipalign build error

Change-Id: I9b8c378549dd90921e857a151a99b0567a934243