Merge "Introduce TextView attribute for control justification." into oc-dev
am: 31eeb08bdb

Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5