4K align data blocks and introduce file block maps to optimize OTA size am: 305fca6134
am: a16d3bd985

Change-Id: I9f931f907fb56f2877c542e08845676999e6d75a