Snap for 5029157 from ee867d0c901502f491a9d3fcca64d01f0ef98e97 to oreo-mr1-vts-release

Change-Id: I085f227d62d5216e35cb00e9794e7b6a8ab31053
tree: a1486d7d31547b4229e685436ad97ad64ae44bea
  1. nn/
  2. Android.bp