Merge "Add support for xhdpi when injecting a skin dpi into the emulator."