Android CTS 6.0 Release 13 (3530687)
Merge "DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in)" into marshmallow-cts-release