Merge "unique_fd is passed by value in AIDL interfaces" am: 92ef3ad391 am: 2a3219d601

Change-Id: I7b6015623dd73c849b6e92ca055dc1693eb167c7