Merge "Make proper ATV SDK build"
Ji-Hwan Lee [Sat, 17 May 2014 01:19:36 +0000 (01:19 +0000)]

Trivial merge