Automated merge of MTK Keystone code for various_libs am: 9f0dee706b am: 519bf2cdb6

Change-Id: If70cf4cb63b8431dff4c3726d25b1939842542b4