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

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1