tree 3b2aeb489a89efdf9800f46caffa112e14da7d34
parent c9234136dfb07984a4e620fcac05dcaa7e8f3818
parent 24309a8ec4bfbc3a76e917c575dbdef088b2dae4
author android-build-team Robot <android-build-team-robot@google.com> 1495666414 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495666414 +0000

Merge cherrypicks of [2310999, 2310925, 2310891, 2311000, 2310892, 2310858, 2310986, 2310963, 2311043, 2310928, 2311044, 2310990, 2311022, 2311023, 2310917, 2310994, 2311024, 2311045, 2310967, 2310995, 2311003, 2311059, 2311025, 2311060, 2310953, 2311061, 2311004, 2311046, 2311005, 2311047, 2311006, 2311079, 2310954, 2311026, 2310896, 2310898, 2310997, 2311062, 2310955, 2311029, 2310998, 2311080, 2311119, 2311030, 2310933, 2311140, 2311063, 2310934, 2311049, 2311050, 2311084, 2311031, 2311145, 2311164] into nyc-mr2-security-c-release

Change-Id: I3f92c1b8db915c69e30f15ccd97eeb9d9c892621