Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev