Android 5.1.1 release 17
am 9d3d44fa: Merge "Fix bitmap filtration tests to be more stable" into lmp-mr1-dev

* commit '9d3d44fa31e276f9ca13c741398c6e3c686213a3':
  Fix bitmap filtration tests to be more stable