am 86fa7ead: Merge "Add cleaned-up filter framework, camera, gallery back to .classpath"

* commit '86fa7ead3f798379190a8b46ce468c6bf67f495a':
  Add cleaned-up filter framework, camera, gallery back to .classpath