Snap for 4396223 from 1af33897ebdc15c41c94f93535df8904065d211b to oc-mr1-release

Change-Id: Icc95a2df808220c564540cb4c41e1bdc90ae93fe
tree: 9515bb8a2869b6cfc3a0805d59c01ee6b76bceae
  1. nn/
  2. Android.bp