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

Change-Id: Ia62c52ec75d5581cacfd5aed99c12516c40709a5