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
1 file changed