Merge "Remove fastdeploy dependency on libandroidfw" am: 662a3a6cc3
am: 927971851e

Change-Id: I42ba2d9897f0a3033d4f8141c1d948c64fa179ac