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

Change-Id: I859a465c8edfb59da287f7e0fb3c4fb2caa76523