Merge change 20445 into donut

* changes:
  Integrate unsubmitted cupcake change 131127: 	CTS: add test cases for graphics.ComposeShader, CornerPathEffect, DashPathEffect, DiscretePathEffect, EmbossMaskFilter and LightingColorFilter
tree: 3fe7af8ed6d4c97072e270a0742743a8bf9a6f1e
  1. tests/
  2. tools/
  3. Android.mk