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

* commit '0ccde5f97891218298c6ae1c2b1607e7898abd36':
  Cleanup fastbootd Android.mk