Merge "Add more unit tests for RelativeLayout"