Merge "libbinder: recommend merges in AOSP"