am 1c6e609b: am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev

* commit '1c6e609b2b5409b34d5928f506306ed9ad21adb7':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft