Make the examples a bit easier to use when one file means one example. Change-Id: I2f5b49ccf3fdea1ef1ef534b68dde9ae0e59bd2b