DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests am: 85369ed153 am: ab84c778ab am: 27718d0c7f  -s ours am: f2129aadfc  -s ours am: 784224c62a am: 22212d14f0  -s ours am: 6e3a082677
am: b43a8e2611

Change-Id: I56a9255008cc93d1c1ad9012c53bbf8c7a67a61b