Merge change 21032

* changes:
  Default mBaselineAlignedChildIndex to -1 so it will still be valid when a LinearLayout is created programatically.