Bug: 235870415 Tag: #floss Test: ./floss/build/build-in-container.py Change-Id: Icaedef0aedd479ce19c3093eb36619ec79a14980