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

Change-Id: I3225ab882809159ae1deb97efc0469d8b2777cbe