Merge "Avoid creating compiled_methods_ array unnecessarily" am: 32df620576
am: 403ef657ef

Change-Id: I06ba43ceadb18d445bea706acc3cd399c5442c56