Merge "Add "Available since" text to all android/ headers." am: 79ad55323e
am: bce4d907a2

Change-Id: Ief6f11b06f2f0c4d2e0137a3e50242d8d72f0ddc