Merge "Rewrite auto prebuilts to external/auto"