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

Change-Id: I79dd18f78e4264482ae965319de4e0d99828f7d7