Merge "libsysutils: Fix potential overwrites in FrameworkListener" into honeycomb