Merge "Move art related hidden API flag files to art"