Merge "Use VDC for API 21 and 22 to workaround the ImageView scaling issue" into nyc-dev am: 398eb9e
am: 67e0930

* commit '67e0930afcbd2d50ae3a11c92eccbcd1f6c91418':
  Use VDC for API 21 and 22 to workaround the ImageView scaling issue