Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE" am: fe79660d1e
am: 7c4bcfc298

Change-Id: I45af296fbec2d35434e0dd0fda4649e6c07e56e3