Merge "app: aboot: Change to enable hibernation support."