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

Change-Id: Ica7d321af1f41434c0057a0f39667276cfe7e18e