Merge "frameworks/base: remove build/ and dalvik heaps"