Merge "Mark oemhook related APIs @Deprecated." am: 1ea0b49987
am: 3c04b71ce3

Change-Id: I8cf8ce42922400fb2f213cd22893878c49c1f654