[automerger skipped] Merge "Add support lib wrappers for clients" am: b2f3e87ce3 am: ec48df715a am: 2cde0fe22c -s ours
am skip reason: Change-Id I0157df310f85d83cef07282ea80204c035626518 with SHA-1 3d035b9c0b is in history

Change-Id: I28ff7d1bd42516df5502eba0efbd5e112fcca115