Merge "Add support for booting with a boot classpath not fully AOTed." am: 98b970dd74
am: c38dde0cdc

Change-Id: Iee7f4861a0d769e88c90f20c22fa4e81dc11618f