am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather...
am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h"
* commit 'a82b5f57':
libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h