Merge change 8283 into donut

* changes:
  Integrate unsubmitted cupcake change 149408: 	CTS: added missed test case for android.content.ContentProvider#openAssetFile, refactored BrokenTests for ContextWrapperTest
tree: 436952e8dc5e13a706022568a15f1f4d021bded0
  1. tests/
  2. tools/
  3. Android.mk