Merge "fallout of splitting rect.h out of libandroid."