[automerger skipped] Merge "HIDL stuff to TestApi." am: bc79587a85 am: e6883edf8a
am: 93b988e6ba -s ours
am skip reason: change_id If784f4949af931c6c4efc284f1d16414705fe2d4 with SHA1 cbba4c7a49 is in history

Change-Id: Ia0ab0579e607b29f2335ef3de0901b5e51cdbd18