Fix issues around GoldfishAddressSpaceBlockProvider::open am: ad9efd08e0 am: 881a3d9a8c

Change-Id: Ie9741c8377b11862f5b23935c15fa4e131f96d70