Merge \"Remove previous GCA prebuilt location\" into nyc-dev
am: ea10423afa

Change-Id: I166e4671c96c069b62c76507a46cec332dadc251