trim memory tracking clean up
Merge branch 'issue/track-all-trim-memory-levels' into issue/revert-3.0-rc-1-changes

Conflicts:
	src/org/wordpress/android/WordPress.java