Merge "Add sdk extension version info to prop templates" into stage-aosp-master