[automerger skipped] Merge "Create libstatshidl" am: 2649732a41 am: 4cbc5f08d8 am: d0b35ff732 -s ours
am skip reason: Change-Id If704ae440246390fb15f6619048f18f14c106a01 with SHA-1 6442198e8a is in history

Change-Id: I8c83f7c57faae048697d6c42d15930f442436b3d