tree 3639d50415a008b071b82babcd33951ea2affd94
parent a8c819d98c2b3468b430d733d182a84a8bc7ad24
parent 0c2998ffe31bab644c74d80b0ab963ee8de16230
author Tao Bao <tbao@google.com> 1526087179 -0700
committer android-build-merger <android-build-merger@google.com> 1526087179 -0700

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

Change-Id: I5d4765279fa10317e7f8d61cc4f0972baf10040e