tree 50ea1915d5a6f740a867d3120ddd1521a7f0d84e
parent 43972fdb6beab8ec242b084acf32e3d5c6ff9b82
parent 719a02c671ff21460d5d78cbc7d8e5c1e584473e
author android-build-team Robot <android-build-team-robot@google.com> 1497638772 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497638772 +0000

Merge cherrypicks of [2420241, 2420242, 2420222, 2420190, 2420097, 2420079, 2420098, 2420099, 2420100, 2420153, 2420120, 2420208, 2420281, 2420209, 2420282, 2420301, 2420192, 2420302, 2420193, 2420211, 2420264, 2420247, 2420157, 2420265, 2420216, 2420307, 2420217, 2420250, 2420341, 2420219, 2420326, 2420180, 2420254] into nyc-mr1-security-a-release

Change-Id: I7e66c020dd081f82c296bf0e374cab44973e3eb7