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

* commit '2623a24ffa4d75206757684b12b06318167f8788':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft