Merge "Add two operations to 1.2 nn hal."
am: af32d47028

Change-Id: I0e4545c5ca8742c0cc054d11af1a68334dc2a510