Merge "DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in)" into marshmallow-cts-dev am: e4d4378558  -s ours
am: f4be2b6696  -s ours

Change-Id: If578fb5df8f114f5a54954847811334931d31feb