Merge "Revert RelativeLayout's baseline view to API 22 and below behavior"