Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
am: e6c721390e

Change-Id: I1e4f4dae80a119505baca6020d64d96dc09dff87