Merge "Delay mediaserver/mediaextractor during boot"
am: 855ae44d9f

Change-Id: I34a3780506ec5a9852c5fe55180c844dd5e734d0