Merge "libbinder: Fix Android.bp formatting" into main