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

Change-Id: If62548c7b8aed57616c6c03ce352c6c6047b98ce