change EFI to use currentboot

Bug: 997629
Change-Id: I7d5922118dc76748d49b01631480f22719b22c9b
Merge "change EFI to use currentboot" into develop