Merge "Simplify NNAPI SharedHandle -- hal"