am 131564d2: Merge change I3bbfb4f9 into eclair

Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-plus-aosp

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.