Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev