Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp * commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6': Add makefile so package manager test apks can get buitl from root.
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp * commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6': Add makefile so package manager test apks can get buitl from root.