Merge commit '9be25d09' into gingerbread-plus-aosp * commit '9be25d09': Clarify the invoke-* opcodes.