Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: CTS: Verify DynamicRefTable::load security fix" into marshmallow-cts-dev am: 936034e8d5  -s ours" into nougat-cts-dev am: 62ba6e8def  -s ours" into nougat-mr1-cts-dev
am: f6d381cd35  -s ours

Change-Id: I98890890331e17ff30f6a3b7cfcf8e6091caf87a