[automerger skipped] Fix the order of width and height for NNAPI...
[automerger skipped] Fix the order of width and height for NNAPI RESIZE_BILINEAR and RESIZE_NEAREST_NEIGHBOR am: 9bfecb55
am: 012e6937 -s ours
am skip reason: change_id I6c79459fa73347fb51fc34a76ad78d5ac207f210 with SHA1 286339b4 is in history
Change-Id: Ia35bcc53b38ecbf4838ea5e273af8316c2010f51