Merge change 20162 into donut

* changes:
  Integrate unsubmitted cupcake change 131124: 	CTS: add test cases for graphics.AvoidXfermode, BitmapShader, BlurMaskFilter, ColorMatrixColorFilter and ComposePathEffect
tree: d0e1a37fbbba9fafdda2a13a9e7fd265f6d37f75
  1. tests/
  2. tools/
  3. Android.mk