am 1864d01f: Merge change Iae849da2 into eclair

Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-plus-aosp

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter