Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee
am: 4b026b656d

Change-Id: I9fca856876619c380529df90fdd86e276666dbb3