Merge changes I1868fb75,I9ff504c6

* changes:
  Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE.
  Adding VP9_FRAME_MARKER constant.

diff --cc vp9/common/vp9_blockd.h
Simple merge

diff --cc vp9/common/vp9_onyxc_int.h
Simple merge

diff --cc vp9/common/vp9_reconinter.c
Simple merge

diff --cc vp9/common/vp9_reconinter.h
Simple merge

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge