tree 03711539bfcdbeec43ed51b55052f17bdf56246d
parent 0e42c5680c281e3ecb7c4b6befe8cb2b82504cc5
parent 1f0b9962b0b5c7b008e770b07010ae1e52417214
author Tao Bao <tbao@google.com> 1526086908 -0700
committer android-build-merger <android-build-merger@google.com> 1526086908 -0700

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

Change-Id: I79b21e9b93f8876a00176751a4664f6175a384be