Merge "libinit_test_utils: don't assume interface format" am: 579e4b3d2b am: 311923848f

Change-Id: Ifab8bbba1299b24c7c98f39326c50c4cac4f3b4b