Merge changes from topic 'sepolicy-makefile-cleanup'

* changes:
  Android.mk: cleanse all set but not unset variables
  Android.mk: clean dependencies and clear variables