Merge "reflect libbinder/am split" into sc-dev