Merge "Revert "Revert "Introduce support for hardware simulators, starting with ARM64...

author Roland Levillain <rpl@google.com>

Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)

committer android-build-merger <android-build-merger@google.com>

Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)
author Roland Levillain <rpl@google.com>
Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)
committer android-build-merger <android-build-merger@google.com>
Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)
diff --cc Android.mk
Simple merge
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/parsed_options_test.cc
Simple merge
author	Roland Levillain <rpl@google.com>
	Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/parsed_options_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history