Merge "Export lib3 to AOSP (System server part)"