Fix PRODUCT_BOOT_JARS additions

Change-Id: Ie6bc0dab809f45d51efb2e0f278d08fd516d12a1