Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

Change-Id: I255db0e1b1def966a79acf865a23ba1ef5261831
Adding back pdf_printer_media_sizes for values-zh-rCN to accomodate mediasize_default

Change-Id: I45cfd8babe813fa5dba49bb444e10517a3771f30