Merge "Fix unbundled jack builds" am: fcdbbd0dbf
am: b7665ed25c

Change-Id: Iee86222934e9d29c8a0c367dc4848f9a945f050d