Merge "Don't automatically include the build directory." am: 4169f6396f am: d5d508c396
am: be0998f1b3

Change-Id: Ie067754c0d100e31aea6e27c338d6484c5575c94