espresso: Changes for new libs + RC2

Change-Id: Iea90040ca0af5b10866ff16326065042f5658312
2 files changed