Merge "stagefright: add a property to choose hw codecs in thumbnailer" am: e91c38936d
am: 081c7fb26c

Change-Id: I26379008e6d434f6a8982f4f8c908cea61b4c732