tree 72a9f9e8fd66baf9677f8fa5417ddbf20b9c9fb2
parent b1040364ed078763cc58770066f0b314c36bb003
author Colin Cross <ccross@android.com> 1496866807 -0700
committer Colin Cross <ccross@android.com> 1497402287 -0700

Master is now OPM1

Remove OPD1 from master.  Also remove the temporary workaround
for b/37208937.

Bug: 37208937
Bug: 38436796
Bug: 62596317
Test: builds
Change-Id: Id4ea864e1d78bb793b2d4a0705673a66a957acdb