Patch 2: Fixed the possibility of no CM_EXTRAVERSION resulting in 2 '-' at the end of the file name. Change-Id: I3025977a5da1e28247c74416e1ac50fc6901eb23
Patch 2: Fixed the possibility of no CM_EXTRAVERSION resulting in 2 '-' at the end of the file name. Change-Id: I3025977a5da1e28247c74416e1ac50fc6901eb23