Merge "libutils: flattenable deprecation comment" am: 6c1668d660 am: ae1f84cecb
am: ce3f9a4405

Change-Id: I48961225d12f755b40dc3c153d4ee718f838ebcd