Merge "Move fsverity_init to after class_start core"

    mkdir /data/bootchart 0755 shell shell

    bootchart start

    # Load fsverity keys. This needs to happen before apexd, as post-install of

    # APEXes may rely on keys.

    exec -- /system/bin/fsverity_init

    # Make sure that apexd is started in the default namespace

    enter_default_mount_ns

    class_start core

    # Requires keystore (currently a core service) to be ready first.

    exec -- /system/bin/fsverity_init

on nonencrypted

    class_start main

    class_start late_start