am 3b6f86c9: Merge "Fix NVMAP_IOC_FROM_ID test" into lollipop-mr1-cts-dev

* commit '3b6f86c9da6fe76d0466bbf9ab53953e199af505':
  Fix NVMAP_IOC_FROM_ID test