Merge "Hook up event handling in NDK MediaDrm API"