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