Merge "Add android/log.h to Rect.h" am: a422103c90
am: 20b8c55a5e

Change-Id: I48190e464c2667edaf8cf71a27581c8bd929c1be