Commits
Jingning Han committed c4e807ae2f6
Fix compiling errors due to git merge There were a few conflicts between the new non-RD partition search and recent clean-up patches, which were not caught by git control. This commit fixed these issues. Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797