Revert "[CB22] Merge add and delete"

This reverts commit f6bce235ae4cb4dc366dbfa534e26ad416b14e6b.

Seeing several new unit test failures after this CL. Reverting..

Change-Id: Ie97127550ee36dd4a07a36701e9c5118684dfbc5
1 file changed
tree: a0f0ecd497d6cdc7c5d4220ddf7bbdeea0e0ad58
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk