libFDK in libaac: Add conditional definition to switch arm asm for
devices that don't support thumb2. Tested on heroc with armv6j.

Change-Id: If93892e920097ac7bdfa3f15d2ad1ee6d04bdcc6
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/aac into mr1-staging
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0