Merge "DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in)" into marshmallow-cts-dev am: e4d4378558  -s ours am: f4be2b6696  -s ours am: 5ddf92d8f1 am: 2619251042 am: dc48e218b7 am: 226afd5a1d
am: f558ab32ab

Change-Id: I5cfcacb809298b2c89c82214c758b89d38a771bf