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

Change-Id: Ie53f306995ab6876fa4e599b174d99131aaafe4f