Merge changes Ia7850577,Ic96e9e14

* changes:
  def-tool: Support VdexHeader 21
  def-tool: Add libdl_android for LLNDK-Private