2 more 4.9 patches

Greg, Attached are 2 more patches backported for 4.9 adjusted for context. This allows Android to drop two more out of tree patches that already landed further upstream. I did a quick build test locally.

They are needed for 4.4 as well. The mbox doesn't apply cleanly, so I will resolve that and send them for 4.4 tomorrow.