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

Change-Id: I59cef7f9f993d4458efd0848441860a3d19281a1