Merge "Rebuild odex files in PDK fusion build." into nyc-dev