Builder macros for generating indexes

Add in new macros for generating indexes and uploading files with
or without them.

Change-Id: Ia10ad3d62631744266bc9ed2a813dc91e52666d2
Merge "Builder macros for generating indexes"