Convert add-module-block and add-toplevel-block.

Bug: 293289578
Test: Ran on aarch64-paging crate.
Change-Id: I800212559ef8a72fefbd7b24e352c37151d61c1a
1 file changed