remove duplicate constant macro and modify the num_ref check accordingly
add a missed line in last commit
Merge pull request #1368 from sijchen/remove_dul2

[Encoder] Remove duplicate constant macro and modify the num_ref check accordingly
Merge remote-tracking branch 'upstream/master' into travis.android