Merge "Fix problem passing null optional operands." into oc-mr1-dev
tree: bce38daa4684dc61ad28d76bf9e14622f63c8a7b
  1. nn/
  2. Android.bp