Merge "Fix the order of width and height for NNAPI RESIZE_BILINEAR and...
Merge "Fix the order of width and height for NNAPI RESIZE_BILINEAR and RESIZE_NEAREST_NEIGHBOR" into qt-dev am: e867be8b
am: 0221549c
Change-Id: I795b47ee8e8a6640dcbfd69ea6a9606c003dffd4