Merge "Replace OUT with PRODUCT_OUT"
am: 59898630fa

Change-Id: Ic2a5b0df011439f691101a3563e5ca3760ab8202