Merge "Fix NVMAP_IOC_FROM_ID test" into lollipop-mr1-cts-dev