Merge "Build debug library libdexfiled" am: 3e55ea3118
am: 6a4ac4adef

Change-Id: If528bbde119b5de4210e46adaa2dbe7fa2f7f1b3