Merge "def-tool: Add APEX bionic to minimal tag file" am: 2d4d67b747
am: 1ba0339d86

Change-Id: Ic24cb6d8f60e4db028d72e87ba28bb174561a096