am 5c9d6e5b: Merge change Ie46db339 into eclair-mr2

Merge commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01' into eclair-mr2-plus-aosp

* commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01':
  Remove "unused" opcodes from API.