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

Change-Id: I6499f19e64955d60b449c01348f05764054033c3