am 4a8a7231: am 0ccde5f9: Merge "Cleanup fastbootd Android.mk"

* commit '4a8a72314ca6ff82397b768e3fdb7ca0b1390c81':
  Cleanup fastbootd Android.mk