am 5304d8fd: Merge "Introducing "strict project map"." into froyo

Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp

* commit '5304d8fdc9064f2831ef16db9242f17110287997':
  Introducing "strict project map".