Merge "Skip HIDL tests in libbinderthreadstate tests when HIDL isn't supported" into main