am 21a6703d: improvement and fixes for bindings test (DO NOT MERGE)

Merge commit '21a6703d6e00c6b267bce313d52a325ed9ff6e47' into gingerbread-plus-aosp

* commit '21a6703d6e00c6b267bce313d52a325ed9ff6e47':
  improvement and fixes for bindings test (DO NOT MERGE)