Merge "libbinder: vendor_available" am: e1b504457d
am: 9d7f5c867b

Change-Id: I9b29afedaab9487a96c448a7c791ceb059df2bae