Merge change 1875 into donut

* changes:
  Fixes external #2669. Clarify the documentation of the XML attributes android:gravity and android:layout_gravity.