Merge "Add the new SHR_RELR test libraries." am: 79677a2be4 am: 9ee56dabbf am: 7aee97801c

Change-Id: Iefa011702e71de184d0620f6650922580e965595