Merge "Stop creating /{&&,mkdir} directories." am: 5a34c00716
am: b9c3310c22

* commit 'b9c3310c229d3ab06724f2b89161389178b3e79a':
  Stop creating $ANDROID_BUILD_TOP/{&&,mkdir} directories.

Change-Id: I0e6f3b97eb5a0d12830f6b8701aeffb417fa8d8d