Merge "Fix include after spliting HidlSupport.h"