[automerger skipped] NNAPI: Regenerate types.hal to sync with types.spec am: e4f1583337 am: 4743cd38bc am: 79c5abb6ee -s ours
am skip reason: Change-Id I2b41bd959b7084ecb89674c659c66ebb158ac77d with SHA-1 2d7c489f67 is in history

Change-Id: I30bae4a1f32897bcc7c0ffca01eaf2b8f1afccd5