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

Change-Id: I2e9881c1c7da643d764f3f3fc82015a735761517