Merge "Update prelink map for 2.2 props and prepare for RC2" into froyo