Merge "Remove obsolete rules to build runtests"
am: 6c99499c8a

Change-Id: I5e10478e2ffadec2c0ccad151c49c24e24e05a96