Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp * commit 'b766ab830a714c0b79f64265e681f454865ffe65': DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp * commit 'b766ab830a714c0b79f64265e681f454865ffe65': DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml