Merge "Fix HIDL token passing mechanism for non-Treble paths."