Merge "Add makefile so package manager test apks can get buitl from root." into froyo