Merge "libbinderwrapper: Android.mk -> Android.bp"
am: 8a85c253bf

Change-Id: I48f566cc646a6b708a34389b8836a4441fe86af5