Merge "Enables child APKs, fixes a package parsing bug, and adds tests."