Merge "Remove fastdeploy dependency on libandroidfw"