Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595 am: afe46992b8
am: 7ae2aa4ed9

Change-Id: I400a01127f077fa0d0656eafc4ccc15aed375fcd