Merge changes Ie4ea31b8,I87ff245c

* changes:
  Convert to Android.bp
  Remove renderscript filters