Merge "Revert "Revert "Add benchmarks that run simple programs""" am: 41488b79c4
am: 280888571a

Change-Id: I051ed4b85d301f04b1e5c6331459bbcf47be0341