Unspecialize oc-dev-plus-aosp

oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.

This reverts commit 096aaeee.

Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da