Fix matrix combine logic for AIDL HALs.

Also, add loads of tests for matrix / manifest combine.
Fixes: 140590973
Test: libvintf_test
Test: vintf_object_test
Change-Id: Ifbf5026953d0e350834dc9a055d6528bb4bfcdc4
3 files changed