Merge "DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in) am: a8f267cd3e  -s ours am: fce73a9d80 am: 813573950c am: a5034f0b4c am: 1a277a998b  -s ours am: 1bd235f277 am: 906e50365d am: 5484339a1a am: 4ff7544d15 am: 94e457693b" into nyc-mr2-dev-plus-aosp
am: 1b5f94b36b  -s ours

Change-Id: I52ed1a0264025358232118978cbe66faf230b0c9