Merge changes from topic "b/67046543"

* changes:
  Fix build warnings with '__bitwise' macro redefined
  Remove fsstress from build