Merge "libbinderwrapper: Android.mk -> Android.bp"