Merge "Add "instant app" boilerplate"
am: 82dfcb76fe

Change-Id: I7bef82ce06d427a6a4378467e15956cba4ce3ff0