Merge "Add system and oahl stubs to veridex.zip"
am: cb4c8b5943

Change-Id: I1d7a7a0616b5508f1a1dbd38bf9b1e20b83a5ad3