resolved conflicts for merge of dfc99234 to dalvik-dev

Change-Id: I0b5b19f9f6cd7aa0b3b51e0f9b87ce21c3175771

diff --cc vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_PREDICTED_CHAIN.S
Simple merge

diff --cc vm/compiler/template/armv5te/TEMPLATE_RETURN.S
Simple merge

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
Simple merge

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
Simple merge

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S
Simple merge

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
Simple merge

diff --cc vm/mterp/armv5te/footer.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv5te-vfp.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv5te.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv7-a-neon.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv7-a.S
Simple merge