Merge "unique_fd is passed by value in AIDL interfaces" am: 6316f348e7 am: 7aa79697cd

Change-Id: I3dc4eb33e0983fff27082ae0852f0a239e9fc957