Merge "Callback elision for HIDL interfaces." am: b7ee96a666
am: d390a8291a

Change-Id: I6977094aa5a97d82b51c18f605e258046c488c7e