Merge "Modified fastdeploy dependencies to ensure that fast deploy is build as part of 'sdk' target" am: 50fe7eab0a am: 3c1bc8c58c
am: 83d1941477

Change-Id: I99c5cb8c6760467363aa33524706b4cb02f59cae