Merge "libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h"