Merge "Update HdmiControlService JNI to the change in HAL definition"