Merge change 26540 into eclair

* changes:
  Make the Density enum use the int value from the api Density enum.