Revert "No more prebuilt su"

This reverts commit 6d4b23a6684bbef1c7516d82f4681f8e861569ba.
Include development

Change-Id: If4aeb7d7c6d0ad5f964ff3015a8c3e5d57ca2ffc