Merge "Callback elision for HIDL interfaces." am: 33bd8a97b3
am: 4369507dcb

Change-Id: Ic9ea53f3b7cff0d656b6147ca6d159b75df0bdda