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

Change-Id: I53114bcc4c9edf9ab98927fddf4e259f75369139