Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"