Merge "Replace the ArtThinBuild.bp files with patches that gets applied instead." into main