Merge "Update nn hidl to version 1.2 in compatibility_matrix.current.xml." am: 190473b02b am: 00e60996b3
am: 317778cb1f

Change-Id: I1836935e921164ca875cc0667c2c4569c49696f2