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

Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa