Merge "Merge "Merge "Create includes/common.h" into oreo-cts-dev am: 43add9855c" into oreo-mr1-cts-dev am: abf956069b" into pie-cts-dev