Merge "Remove unused HdmiCecController jni library"