Merge "Separate out ESDS as a static lib"