Add some more Android compatibility declarations. Change-Id: Ia1de2b746dec680eb59dc614295a1da289c5741a