Merge "Add isUpdatable to NNAPI canonical IDevice -- hal"