Merge "def-tool: Add libclang_rt*.so to update_dataset.py" am: 75fbfc74af
am: 1a8e24ce5d

Change-Id: I1860b0bbcb9272f504388e40f3221f3a4164d6a9