am f49c3ae2: am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1

* commit 'f49c3ae2da7b6343088200bdafdf6e9906258bf4':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class