Merge "Allow NN HAL service to read files from apk data files"