Merge "Replace OUT with PRODUCT_OUT" am: 59898630fa am: 1a72bad494
am: 27e0076b78

Change-Id: I11b9d77f0c312cb0d07808b8116f6078c8c191c6