Merge "Remove warnings in Rect.h"
am: 13996341b8

Change-Id: I77287527167d9673310f5fd16f919b7e7bd4d08c