Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev