Tweak package name / build rule names
am: f1c07b12cd

Change-Id: Iddf0169c3898dfd1ef56a8f7a0fc62055c9cb206