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

Change-Id: I8fe65475b8b0a17b73356b46f803947277570601