am 840ea01f: am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev

* commit '840ea01fcbafe5d6b3fc8d90dcb5d99a65fa0113':
  Fix bug #6427629 Clean up layout direction APIs