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

Change-Id: I50160499ab02584343f903372de922abd8793218