Fix merge error

Change-Id: I9a9ffebaac3364da3408b4c4703d47c159dc24ae
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	vm/mterp/rebuild.sh

Change-Id: I3de8c8d6bf5b6d51e86ac7fd1237e944611f3956