Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-12.0

61c5a4df1376a5e9accdd8a31b041048bd8adeff
32768aff79ab992cf79922564535b45148903705
e984d682655d4bb6c36b7b346aa3b26a8983f0b5
bfc52120afa3e8dbec2b513db6cb06ce14783280
4102de0a403c52dd221d7b2603a1638358a760fd
2be50a9db29c2d9803e22b697982e7e411baf1c1
17360fd7b1f3964bec9041859d28b4b32f523701
b846adf204b67aedd99880d958868cc4dce89b28
65cca37742ed22d5ccb4c18e4a84b43031aca1cb
96c540029d6532359fb54c45695c8e800fdae83b
0d29b6dbbfe23bacd7a07f524d647bd4a38b5cc0
4e3496ba5beabd4488f18257f2cd7bc0accc7bce
889ba33f13965c7b591a2a83b54df590e739ea76
b46c5ec24c7b7d4446547b41f58cf7e03353ff4a
70fcaeaae404c7c770bbad1012a009d09429a680
3926d3fb0cb534e7e7973d4976294e076668eaba
1090494d3943be5e8e0efebc79e478e855ce813f
6f5c7f7550f30e157c97240e0faec0665b5a875d
ba1bae93ece02ddd03c7ab93f58ac399cf95c7a7
341fa5358284e2b3d9927cf91cbd189f20b977b1
4662176643ef410489b4a5b3e242c4f3d3701059
599653eb03efabbbc578cbf50b31e3694d3829f0
06468eca2e35e4cc40094b926f44c96c8566c401
3002ead920b86dc5b9206c5b60f93cc9a70f13bd
016c5b89bc47b80f6bf7e3971a5a7e50b2c67485
1fa9d1e167edd145858c8cfe79a36dcd2337f3d6
602e926193ba48cb59955fd381d0f89db3a0b44c
35420dfb803bd1ad629c27575d4141b4df28dd78
d6d4e8eb69bb3ee18670ccad42c35024b08a8191
001c3e711b7b90a331ebe44b527948e9e47c6332