am 2c9ea21d: am 7ab237f1: Including dl heap stubs for the dalvikvm host build

Merge commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43'

* commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43':
  Including dl heap stubs for the dalvikvm host build