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

Change-Id: Ifb7d6d7a423b131391373fce06cd27a3e9948df1