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

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5