Fix twrpTar building

- ifdef around set_metadata
- Set tags as optional

Change-Id: I438e370c3bf6b590dc80ba372724c47cead6cbe5
2.8.3.0

Change-Id: If2084a8c8815b079db6b6a6b45ea180ba1282092
clean up merge fail

Change-Id: Ie26837ca46a4f3c31a43822e808673eff6df4cb3