Merge "tpm: export vlan and ethertype." into prism_dev