Merge "Build: Build changes for multi oat/image support."