Merge "Create includes/common.h" into oreo-cts-dev