tree 3639d50415a008b071b82babcd33951ea2affd94
parent b8c632aa9a585f39392128e3cc4aa4a8b2322618
parent 554a876cc13a365b9aaa7d8131d2433b16962780
author Tao Bao <tbao@google.com> 1526087746 -0700
committer android-build-merger <android-build-merger@google.com> 1526087746 -0700

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

Change-Id: I830f6023b59de90e42706359a12d38191a74bf34