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

Change-Id: I3a917897db4ef755a83c12967119bc67d6161633