Snapshot 2bda038c163298531d47394bc2c09e1409c5d0db

Change-Id: If584e579464f28b97d50e51fc76ba654a5536c54
Merge android-4.1.2_r1

Conflicts:
	libFDK/include/mips/cplx_mul.h
	libFDK/include/mips/fixmul_mips.h

Change-Id: I71c4b83690d1343aecfd225095c5a4375bc96f8d