tree dfca45dcf9b80d88de96de43bc98f0b9d8e5a184
parent cf4d1c7d32d3d93866fecc780d8d6740d24bd425
author Adam Seaton <aseaton@google.com> 1471541610 -0700
committer Adam Seaton <aseaton@google.com> 1472661251 -0700

Update Security String to 2016-10-01 to platform and CTS for October Security

Fix merge conflict into mmr3
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684