[packaging] Package the diag and acm android modes.

Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com>