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

Change-Id: I00ac7e3b19cfd02b3515a4bda1e3144cac2f1047