Merge "Fix unbundled jack builds"
am: fcdbbd0dbf

Change-Id: I88eca5617801e22c4056deef7b3c40f4c1191f53