Add support for xxhdpi and xxxhdpi when injecting a skin dpi.

Cherrypicked from AOSP (7703f5500464e18216ed77291ef70608ec6b59d2)

Change-Id: I5c89b33ac317b804abb88a7f29faf51809dda1d2
am 454ca73c: Add support for xxhdpi and xxxhdpi when injecting a skin dpi.

* commit '454ca73c639991990eb97784c708156e4b2072c2':
  Add support for xxhdpi and xxxhdpi when injecting a skin dpi.
am 670fc15b: Merge "Enable LARGEADDRESSAWARE for 32-bit emulator on Windows"

* commit '670fc15bf652875fcb1a0a2461ea25a2369aa705':
  Enable LARGEADDRESSAWARE for 32-bit emulator on Windows
am 1f1fe2a7: Merge "Handle emulated NAND devices that are larger than 2GB"

* commit '1f1fe2a7b02bd4dd287f33047139ec78e223c154':
  Handle emulated NAND devices that are larger than 2GB
am b29f71a4: Merge "Upon snapshot restore properly re-initialize audio."

* commit 'b29f71a4db23c729e7cf89d0f15cda0c4c16a4d0':
  Upon snapshot restore properly re-initialize audio.
am f3dacd42: Merge "mingw: Remove annoying compilation warning."

* commit 'f3dacd429f9eda868a57b486bc80826147b95933':
  mingw: Remove annoying compilation warning.
am 43897000: Merge "ccache: Support USE_CCACHE even in standalone build."

* commit '43897000454d59124a52ce8767163163e7c863d2':
  ccache: Support USE_CCACHE even in standalone build.
am 6e9d1d4f: Move bswap.h to include/qemu/bswap.h

* commit '6e9d1d4fc96a32fbac14d3e489cce32f5c69ade1':
  Move bswap.h to include/qemu/bswap.h
am 84569138: Move osdeps.h to include/qemu/osdep.h

* commit '845691383dd6a0ff71acf7aee0736adba350f6a9':
  Move osdeps.h to include/qemu/osdep.h
am 7a78db75: Move qemu-timer.h to include/qemu/timer.h

* commit '7a78db75ad42aea283f5073f51891464104a9fc3':
  Move qemu-timer.h to include/qemu/timer.h
am 37dc41a0: Move more files to include/qemu/ and util/

* commit '37dc41a01f33a1e6aca0458b205c2b1609fe82c3':
  Move more files to include/qemu/ and util/
am e90d665c: Move more stuff to include/qemu/ and util/

* commit 'e90d665cd63a0bc5c3306e1ee3e98ad362546b16':
  Move more stuff to include/qemu/ and util/
am 1c31e3e4: Even more moves.

* commit '1c31e3e43ce4cca85a707dfff631e5e102fdeced':
  Even more moves.
am 852088c7: Move headers to include/exec/

* commit '852088c7e08182c2de563872d558309815cbfa0d':
  Move headers to include/exec/
am 0fdfff3c: More missing include/qapi/qmp/ headers moved.

* commit '0fdfff3cce93e16179a454fd471cd1d9126204e0':
  More missing include/qapi/qmp/ headers moved.
am cc330d41: Move net.h to include/net/

* commit 'cc330d4169441727fecf1da08aee806fc021c4e2':
  Move net.h to include/net/
am 1634ff53: Move dynlink.h to include/android/

* commit '1634ff531961026312bec4b66463bbd8a689c6ea':
  Move dynlink.h to include/android/
am d413fa5f: Move iolooper.h to include/android/

* commit 'd413fa5f2916a2a46494edb320340486b262644c':
  Move iolooper.h to include/android/
am d4e803c5: Move android-trace.h to include/android/

* commit 'd4e803c5e928790b14704ae7f0b048da7ba47fab':
  Move android-trace.h to include/android/
am 6af6765e: Move monitor.h to include/monitor/

* commit '6af6765e2f3bc930d0dce21d752bea570a1b1362':
  Move monitor.h to include/monitor/