Merge "HidlInstrumentor - fix w/ Wpadded"