Revert "Remove "legacy""

This reverts commit 827473605c6bc46e47159c46c84101c43728350b.

Change-Id: I104912e7c3d4532294739f62879827cbe4e4e10b
Revert "common: sync with cm-10.1"

This reverts commit dcf5f9544e58886cc917b0ec55fcdb78eb5254b0.

Change-Id: I82f74a35d497c804c7a4e6192c4a68c2f3a8bd68