Merge changes from topic "predicates_aosp"

* changes:
  Deeper sanity checking of emitted types.
  Emit all APIs using Predicates.