this change is much smaller if you ignore the machine-generated defs.h. TBR=r OCL=26684 CL=26684
Attach a file by drag & drop or click to upload
