ANDROID: update patch stack am: b31f7a7e09 am: d758b2ba2a
am: e8afacac2a

Change-Id: I5f73b43cd04d3f2c1cf1d64f098f76f55a62d135