Merge "Fix build product names and add new file paths" am: 535b91d25c
am: 05d9ee6218

Change-Id: Ie8b9ef45e497ef59d0ecff286dae279d2d1e17ac