Merge "Include android version in newly deprecated constants"