Merge "Fix some build errors." into tizen
authordongsug song <dongsug.song@samsung.com>
Tue, 2 May 2017 12:12:09 +0000 (12:12 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 2 May 2017 12:12:09 +0000 (12:12 +0000)

Trivial merge