Allow compilation with Jack.

Change-Id: I03ccd6cd92102f03d1316b6a1184c49029c91ea0
12 files changed