Merge "Revert "Revert "runtime: Mmap uncompressed dex files (in zip) as clean memory"""

author Treehugger Robot <treehugger-gerrit@google.com>

Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)
diff --cc test/etc/default-build
Simple merge
diff --cc test/etc/run-test-jar
Simple merge
diff --cc test/run-test
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 15 Feb 2017 00:00:49 +0000 (00:00 +0000)
		1	2
test/etc/default-build	patch \|	diff1 \|	diff2 \|	blob \| history
test/etc/run-test-jar	patch \|	diff1 \|	diff2 \|	blob \| history
test/run-test	patch \|	diff1 \|	diff2 \|	blob \| history