Android VTS 8.0 Release 8 (4744587)
Revert "Allow injecting a script to do additional pre-package processing." am: ffa7cb5084
am: 76a230167d

Change-Id: I798940766226c18de4d5a5cc218cfe10a47f2fdb