am f5951baf: (-s ours) am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev

# Via Android Git Automerger (2) and others
* commit 'f5951baf7dcc426485badf19985148b6a2fcf82e':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE