Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp