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

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