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

Change-Id: Iff78a4f014c0a6d8888301c3c8455dc220ceeec5