Also fix packaging of system image (it had an extra root directory in it, e.g. it was packaging android-4/armeabi-v7a/ instead of just armeabu-v7a/) Change-Id: I0254b2680168d25103222f8871b2af37a7406b58
This requires sdk.git Change-Id I6993d6c4 to build (to enable the use of XSD v5). Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
Cherry-pick from master e98f22d Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
e98f22d