Revert^2 "trunk_staging: set codename to Baklava"

This reverts commit 48c54a40987516a27d33bec24faae32aea9a621c.

Reason for revert: attempting to re-land the codename change with updated abi-dumps

Change-Id: Ib097622c10a654c94957d3bcec12b2686bde5125
4 files changed