Merge "Deleting frameworks/base/tests/ActivityViewTest" into sc-dev