Merge changes Icf78c709,Ic7ec11ab,Ie5c9d31e,Ia935bac4

* changes:
  def-tool: Rename FWK to SYSTEM and VND to VENDOR
  def-tool: Skip dex test if smali cannot be found
  def-tool: Rename *-Indirect to *-Private
  def-tool: Remove dead arguments