am 1c60e46e: Produce error rather than assert when encountering a nested function.

Merge commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0' into eclair-plus-aosp

* commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0':
  Produce error rather than assert when encountering a nested function.