Merge "Update DumpRenderTree to look in platform/android for Android-specific results"