Merge "Soong package structure refactoring" am: 264700345d

Original change: undetermined

Change-Id: I2b482006094cf5f2a5037177f78edf649386f78b