Merge "Build debug library libdexfiled"
am: 3e55ea3118

Change-Id: Icf88aac4251d6c456773c8784556065224152491