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

Change-Id: I689e1316b6a08ff15e6bee7e2c0f7f33e263318a