Merge "app: aboot: Changes to avoid warnings during compilation"