Merge "Test HIDL topological reordering" am: 0495818b3b
am: 41953e0c17

Change-Id: I2f2cbd7057c873f108922df85c6c1bf32dc39d19