Merge "Move getTargetSdk to common file"