[automerger skipped] Merge "Remove sdk_base.mk." into stage-aosp-master
am: e9d34eccf3
-s ours
Change-Id: I57b6f2989662308ec66729bcebd52ac772e32038
This commit is contained in:
am: e9d34eccf3
-s ours
Change-Id: I57b6f2989662308ec66729bcebd52ac772e32038