Merge "apexd_host prefers debugfs to debugfs_static" into main