Merge "Remove unused libraries" am: 50d665574a
am: b271256e43

Change-Id: I5e2fe8e20077c8e3f70026312dd8a5dba5123fd1