Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 am: 0c2998ffe3
am: 554a876cc1

Change-Id: I830f6023b59de90e42706359a12d38191a74bf34